From 9d2218f4877423a1a132da4f2563614c681bdaa8 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Wed, 11 May 2005 17:42:15 +0000 Subject: [PATCH] bitkeeper revision 1.1389.15.16 (428243f7AUGUUcGs4LGHbUO4lUoHyw) smpboot_hooks.h, smpboot.c: Fix domU build after ACPI changes. Signed-off-by: Christian Limpach --- linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c | 8 +++++++- .../include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h | 4 ++++ .../include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c index 7c1ef78cd9..c1ca5c5c0e 100644 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/smpboot.c @@ -54,7 +54,9 @@ #include #include -#include +#ifndef CONFIG_X86_IO_APIC +#define Dprintk(args...) +#endif #include #include @@ -1096,6 +1098,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus) cpus_clear(cpu_sibling_map[0]); cpu_set(0, cpu_sibling_map[0]); +#ifdef CONFIG_X86_IO_APIC /* * If we couldn't find an SMP configuration at boot time, * get out of here now! @@ -1106,12 +1109,15 @@ static void __init smp_boot_cpus(unsigned int max_cpus) #if 0 phys_cpu_present_map = physid_mask_of_physid(0); #endif +#ifdef CONFIG_X86_LOCAL_APIC if (APIC_init_uniprocessor()) printk(KERN_NOTICE "Local APIC not detected." " Using dummy APIC emulation.\n"); +#endif map_cpu_to_logical_apicid(); return; } +#endif #if 0 /* diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h index c2c211e5ea..28adeaf244 100644 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/mach-xen/smpboot_hooks.h @@ -3,7 +3,9 @@ static inline void smpboot_clear_io_apic_irqs(void) { +#ifdef CONFIG_X86_IO_APIC io_apic_irqs = 0; +#endif } static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip) @@ -39,12 +41,14 @@ static inline void smpboot_restore_warm_reset_vector(void) static inline void smpboot_setup_io_apic(void) { +#ifdef CONFIG_X86_IO_APIC /* * Here we can be sure that there is an IO-APIC in the system. Let's * go and set it up: */ if (!skip_ioapic_setup && nr_ioapics) setup_IO_APIC(); +#endif } diff --git a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h index c2c211e5ea..28adeaf244 100644 --- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h +++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/mach-xen/smpboot_hooks.h @@ -3,7 +3,9 @@ static inline void smpboot_clear_io_apic_irqs(void) { +#ifdef CONFIG_X86_IO_APIC io_apic_irqs = 0; +#endif } static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip) @@ -39,12 +41,14 @@ static inline void smpboot_restore_warm_reset_vector(void) static inline void smpboot_setup_io_apic(void) { +#ifdef CONFIG_X86_IO_APIC /* * Here we can be sure that there is an IO-APIC in the system. Let's * go and set it up: */ if (!skip_ioapic_setup && nr_ioapics) setup_IO_APIC(); +#endif } -- 2.30.2